Only High: Optimization

Optimization and bug fix