Edit/Del expert now works