Rewrite of fill_args