Start to factor out cross-cutting drafts concerns