use add/remove rather than enqueue/dequeue
formatting