Added some more visit stuff