More work on the previous commit.