Made some changes to labeling