Added edit mode