Better time stepping; queue rotation now a function