made changes for performance improvements. removed hotspots.