Update for latest performance improvements.