refactored conditions params