autonav tweak
refactor