Updated Shock to newest code