some tweaks to the vanilla module