Changed how the labeling of EOS works