Revision up to line 676

up to line 676