Arg for dir + improvements