[D#532] more work done