Make mode changeable mid-session
Merge