optimization work

optimization work