Performance tweaks
Performance tweaks