Performance Fixes Version