Refined architecture...