TDG closes #36