I haven't looked further down in the PR yet, but do we need to do the preview of columns here?