1917 added, 1685 modified