merging in newer code to update the queues in it