Add hoa/visitor and re-order.