updated here with merge restart / aborting