trying to fix the performance problems, updated shared components