performance fixes
performance fixes