added evaluation for all types of shocks