Integrate Kishore's module, merge