More updates/moving data around.