[D#631] more updates