fix bug and remove adv