last updates before moving to the new Xiwami