straight swap with my ifs?