rename & add diagonals