optimization tweaks: