Performance testing  & improvements.