added show and edit aspects