Updated some code around die state.