Removed controller and restructured queue