Changed some things to the queue