modified files to create two module query