Validation, refactoring, new parameter