Late code changes

Line following code includes additions for stepper integration.