added some edits and added back delete