Update data manager per justin's request