minor tweaks to previous