preformance fixes