Added logic to steppers