Update with possible performance bottlenecks