Updated to allow argv, including argv paths