Several revisions to get working - Rick