Version with Switch button