This is (and line 18) the only real change