more visitor entry related changes