working on subfeature edit