ds-234: some more changes