Fixed else-ifs and added arrows