Still refactoring edit