Small Performance tweak
another small tweak