Working on performance issues.
9 files changed