updated for wgdx