Updated transformations to account for to/from global