New layout with t6 district