Added ability to start on setup