xdm update
merge with sys