#365 labeling changes