Major performace tweaks