refactored parameters order to make it consistent