Updates for labeling
Merged?