Continuing to develop the samesign section