make name unique, and uncomment delete function