This is fine,  but would ideally be in a separate commit.