ds: MAJOR improvements