Redo of data management. Preparing for aws