Added Safe Switch proposal