Reworked the existing actions to have start and end methods