Startup logic added