refs #6 and refs #7