added else-ifs