Wrapper changed now receives 3 params