XComplete Overhaul