check my ifs... thanks