Added new method and refactored