added ds and changed URL
merged conflicts