Updating the Step to work with new requirements.