Improve reloading.

Need to get indicies right.