hmm .. good point. i guess ideally this would be refactored to the new QB then