Added ability to quit from controller