code fixed + xsi