Queue logic changes