Saved final changes which should have been in the previous commit.