just added in Ifs
merging