adapted code to changes that came with the wip M3 release of dart