Revise whole thing based on reading PDF