Some changes in Xinha (by Xinha)