fxp/rongokhale changes