Quite a few changes and added innerSteps