refactor how we deal with transforms