Making the Edit Method More Robust