added DDS but need to test and clean up