visitor and apprentice mode changes