Correctly implementing custom change