some tweaks to previous commit