Adds a missing APC and multiple missing supply pipes. Removes uses of step_[xy].