It's not really acceptable to have to pass the data again. We need to think more about this.