Make commentator faster