Made some temp changes
Made some performace tweaks