Minimise re-start time