Modified to save and use initial_sp for restart