Updated edit and show