Second commit to make delete/display work properly