refactored params