More optimisations, restart manually done