-Corrected issues with the delete/create logic