straight swap to my ifs