Made performace tweaks