Fixed scaling factor, still WIP