added more transforming stuff