Integrating Xbox changes