more queue optimization