Added refactoring comments.. will be romoved when refactoring is done1