I added if around all the data. I agree, I'm pretty sure this is the way it should be, but let's double check with Roderick to make sure.