Tweak
Overall performance improvements