Ahhh, yup that would do it! And to the best of my memory you're right on both counts.