changes by Xim