updated show & edit