Simplified logic so 3 is no longer a special value, but 2 still is