refactor oldQueue