Fixed scaling.
Finished merge