I voted for #1, but I agree that we should combine 1 & 2