eliminated unnecessary queue