Changes to user journeys to cope with new tenancy check boxes