Use a queue instead of a bool