Added some code to disable modules