added a few more | _ => NONE cases