update ModuleController code
remerge code in ModuleController