add missing auton and refactor for clarity