Small changes for adv