update to for new shock return structure