restructured
added deletes