more work on mode selection