Improved visitor.