Fixed most of scaling