Editing now fully functional