Improve visitor2