Startup and logic changes
Logic simplification in controller