[D#532] more updates