rewritten Transformation
resolved merge