Added arguments, check for argument size