Merged in my transformer changes