Startup and logic changes