Defeat Diarrhoea (D2)

-- work under progress --