modified name of 'when' to better describe the step