Preparing to fix queue
Fixed queuesystem
Improving queuesystem