last changes before switching off of DDS to explore other options