updates to handle adv options