Made autostart better