reverted everything back to the old DMT design because not ready for liv...

I reverted everything back to the old DMT design because not ready for production.