Krste's updates, part way through section 2.