Refactoring, added new method