Added corrections until line 510.