more defs + removed line at table page end