[D#959] more updates