Optimization

another optimization work