Refactored new method #invalid?