Revert pid changes and update steps per m