slight changes
merged after Mari's addition of labels