Changed the signatures of Genotype a little