Made the framework for Modules 5 and 6