First commit on _adv for better handling of parameters