rename step to use number and context