more TODO
another dt tweak