Added ability to restart without exiting