updated to latest Xtend