More annotation switching