improved, added a show, delete