Dth

merge in @davidfowl 's changes