Added changes to the case and management of inserts/deletes