changed the queue handling, no passing of queue necessary anymore