added labelindex for dan because his computer sucks
fixing merge conflict
fixing merge conflicts because dan sucks