Forgot some bits of the visitor-based draft