Update so that add and remove steps are working