Changed labeling system slightly.