A generalised δ-shock model with two types of shocks. Issue 4 (2nd October 2017)