Simplfy queueing a bit more