updated TBD.  Need to catch errors