swap to my ifs add ako