Added show and edit