[WIP]
Merge optimize
[WIP]