Added 'Edit' mode