I'll revert, but I believe this is correct the way I have it.