More changes - editing works now