Make commentator work again a bit.