Finished implementation of adv outside calls