Six and Future upgrade