removed cross terms with shocks