Fixed labeling, refactored to work better without overwriting original...