Refactoring, some new parameters