updated to use cocktail-ds