Performance tweaks
performance tweaks