local pi diffs
merge request fix