#1577 - Performance update