Rebuilding

Adding back in what was lost