updated cases to match enums