performance tweaks #2