0.58.2 - Finish optimizing