changes to address performance issues.