Okay, I think I have fixed the performance issues