tweaks to scheme to match up with original module