added xsanchez changes