Separate steps and draws