Merge 3 switch changes