Changing up queueing code