Performance upgrade

Made few performance upgrades.