...And reflected those changes in the switch() version too <3