Change Visitor logic