Modify adv version to smarter