Change to work with both 'next_step'