update from Susan on 2/22
fault handling from Susan and Sean