transformation a little bit more correct now