Worked a bit on the scaling