Updated model and scanner