added some modules
added more modules replacement