#40 more performance tweaks