Beefed up the transforms