worked on fixing the issues with queueing