Added infection states etc.