add further performance tweaks