interim commit to share progress
improve behavior when switching between map modes