reviewed and tested, queues changes