Revamp OCR.java