Little bit better queueing, more to come