Completed up to edit view