new scale and more optimization