Optimization still in progress

Due to work in other project, the optimization is still in progress.