Optimization from the last commit