More inference updates