More refactoring - Modify not working