Added Case when display & delete