Improve scaling