moving yet more things out of the trasnform event