Moved more out of assets