Krste's edit to ch 8