Kill data update

@joshua-s can you review this?
Indent this?