Reimplement GH-332 using scanners