Updating with a bit more argparse logic