Code

- proper transformations handling