updated DS
Included tests