update line 112,117and118