TASK: [Performance Optimization] LT, HB: Performance Issues #62