edit mode fixed - incomplete