Update based on technical feedback from ddg team