It looks good now I think (see the screen in the comment above). Should I include this commit into that PR?