many change in the code and replace at the correct place the module