major changes queue working