Integrated fully and done some refactoring to the code