Performance tweak
Performance tweak