added ifs