updated autostart
merged