Some performance tweaks
Some performance tweaks