If that's too much work we can start with your modified LinkedBlockingQueue and then look into rewriting Alex's.