Sure thing -- was debating abstracting it into a helper function between the two, but that was even less obvious. Separating out into the 4 scenarios works