Swap to my ifs