consolidation into xmode