Reworked auto-start