Separate PR vs putting in this PR are both fine I think