oops, some tweaks to fix that mistake