Updating data and shapes

To levels unknown!!