added else & elseif