Checking for 2 args now to correct a previous oversight