handle transforms better