New design with Harry's latest codes all merged