Added autostart
Again, this should not be here