renamed visitor + visitor methods added