Minor change to switch class