Shock added
merged