8-1 added, 8-2 updated