removing original code
adding some more DA stuff