better performance tweaks