Updated to be in sync with book version