OC fix on other files. Adjusted according to the increased number of steps.