Autofocus 2.0 - compiled improvements here