Update 2.0

Accounted for the Valor contriversy