oops, current_step can't be negative, switch to None. + added current_arm_step