final tweaks to previous commit