Added genotype, phenotype calculation