added rest of the modules