implementation tweaks