Refactored, added additional methods