Change to a 'drain the queue' strategy now that I know how