Commit

Proper default for switches