params refactored