modified to split off DougModules