I may have fixed or at least improved the performance issue but I'm not completely sure.