use the reworked queue model