Completely removed the use of Arg.