rebuilt with @splitDiff added!