More mode selection work