Start on restart
Merge branch 'Ahalogy/simplify'