references #14, altering tracking, try best to deal with orphans