input params refactored