xml commented in order to fix bugs