Add 3th param
Reduce complexity