Changed behavior to use a queue pattern