Added autostart and start