Improve stepper and check memory