more optimization work