Added a bit more interactivity with the queue
fixed a merge conflict