Added proper scaling