refactoring: changed order of some parameters