client performance improvements phase 1