Updated curir and stepper