combine 1 and 2 case statements