Modify to use 'otherwise' in case statement