re-included previously kicked DMP functions
indent: spaces to tab
code cleanup