few modif on stepper