Optimizing queue management

Optimizing queue management