updated for change in shock field names