tried some more with the ifs