Minor changes due to the pheno_opt