New method, plus improved notes throughout.