Performance problems fixed!