359.09 XIO refactoring