Scanner now actually works