Second part of additions from previous commit.