Little changes for scaling