[xtram] c update not tested!!!
merge conflict