Original script didn't save enough info.  Added more