Tweaks
Performance improvement