merging back katipo changes