praveen|merging changes and refactoring