Keycut fix (not version bump, just updated code)
Use switch() where if and else-if used to be used