Backfork from XStepper
cleaning and moving