Modify restart task, also add the stop task