little changes for better scaling