Added debug #ifs