Edit mode working