diff --git a/flowcats/build.gradle b/flowcats/build.gradle
index 0ea35e68..a6ce9085 100644
--- a/flowcats/build.gradle
+++ b/flowcats/build.gradle
@@ -4,15 +4,15 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 34
     buildToolsVersion "30.0.3"
 
     namespace = "otus.homework.flowcats"
 
     defaultConfig {
         applicationId "otus.homework.flowcats"
-        minSdkVersion 23
-        targetSdkVersion 30
+        minSdkVersion 24
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 
@@ -47,5 +47,5 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3'
     implementation 'androidx.activity:activity-ktx:1.2.3'
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.3'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7'
 }
\ No newline at end of file
diff --git a/flowcats/src/androidTest/java/otus/homework/flowcats/ExampleInstrumentedTest.kt b/flowcats/src/androidTest/java/otus/homework/flowcats/ExampleInstrumentedTest.kt
deleted file mode 100644
index fd17ff6f..00000000
--- a/flowcats/src/androidTest/java/otus/homework/flowcats/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package otus.homework.flowcats
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("otus.homework.flowcats", appContext.packageName)
-    }
-}
\ No newline at end of file
diff --git a/flowcats/src/main/AndroidManifest.xml b/flowcats/src/main/AndroidManifest.xml
index 2deb6454..ecd36a45 100644
--- a/flowcats/src/main/AndroidManifest.xml
+++ b/flowcats/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="otus.homework.flowcats">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <application
@@ -9,8 +8,11 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/Theme.Flow" >
-        <activity android:name=".MainActivity">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/flowcats/src/main/java/otus/homework/flowcats/CatsRepository.kt b/flowcats/src/main/java/otus/homework/flowcats/CatsRepository.kt
index 10fcb77d..1e7c144e 100644
--- a/flowcats/src/main/java/otus/homework/flowcats/CatsRepository.kt
+++ b/flowcats/src/main/java/otus/homework/flowcats/CatsRepository.kt
@@ -1,18 +1,26 @@
 package otus.homework.flowcats
 
+import MyResult
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
 
 class CatsRepository(
     private val catsService: CatsService,
     private val refreshIntervalMs: Long = 5000
 ) {
 
-    fun listenForCatFacts() = flow {
+    fun listenForCatFacts(): Flow<MyResult<Fact>> = flow {
         while (true) {
-            val latestNews = catsService.getCatFact()
-            emit(latestNews)
+            val factCat = try {
+                MyResult.Success(catsService.getCatFact())
+            } catch (t: Throwable) {
+                MyResult.Error(errorMsg = t.message)
+            }
+            emit(factCat)
             delay(refreshIntervalMs)
         }
-    }
+    }.flowOn(Dispatchers.IO)
 }
\ No newline at end of file
diff --git a/flowcats/src/main/java/otus/homework/flowcats/CatsService.kt b/flowcats/src/main/java/otus/homework/flowcats/CatsService.kt
index 25192882..787829a1 100644
--- a/flowcats/src/main/java/otus/homework/flowcats/CatsService.kt
+++ b/flowcats/src/main/java/otus/homework/flowcats/CatsService.kt
@@ -4,6 +4,6 @@ import retrofit2.http.GET
 
 interface CatsService {
 
-    @GET("random?animal_type=cat")
+    @GET("fact")
     suspend fun getCatFact(): Fact
 }
\ No newline at end of file
diff --git a/flowcats/src/main/java/otus/homework/flowcats/CatsView.kt b/flowcats/src/main/java/otus/homework/flowcats/CatsView.kt
index 6a195f3a..eba22638 100644
--- a/flowcats/src/main/java/otus/homework/flowcats/CatsView.kt
+++ b/flowcats/src/main/java/otus/homework/flowcats/CatsView.kt
@@ -12,7 +12,7 @@ class CatsView @JvmOverloads constructor(
 ) : ConstraintLayout(context, attrs, defStyleAttr), ICatsView {
 
     override fun populate(fact: Fact) {
-        findViewById<TextView>(R.id.fact_textView).text = fact.text
+        findViewById<TextView>(R.id.fact_textView).text = fact.fact
     }
 }
 
diff --git a/flowcats/src/main/java/otus/homework/flowcats/CatsViewModel.kt b/flowcats/src/main/java/otus/homework/flowcats/CatsViewModel.kt
index 0d8ba8a7..43448bf2 100644
--- a/flowcats/src/main/java/otus/homework/flowcats/CatsViewModel.kt
+++ b/flowcats/src/main/java/otus/homework/flowcats/CatsViewModel.kt
@@ -1,31 +1,41 @@
 package otus.homework.flowcats
 
-import androidx.lifecycle.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.collect
+import MyResult
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 
 class CatsViewModel(
     private val catsRepository: CatsRepository
 ) : ViewModel() {
 
-    private val _catsLiveData = MutableLiveData<Fact>()
-    val catsLiveData: LiveData<Fact> = _catsLiveData
+    private val _catFact: MutableStateFlow<MyResult<Fact>> = MutableStateFlow(
+        MyResult.Success(
+            Fact(
+                fact = "",
+                length = 0
+            )
+        )
+    )
+    val catFact: StateFlow<MyResult<Fact>> = _catFact.asStateFlow()
 
     init {
         viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                catsRepository.listenForCatFacts().collect {
-                    _catsLiveData.value = it
+            catsRepository.listenForCatFacts()
+                .collect {
+                    _catFact.value = it
                 }
-            }
         }
     }
 }
 
 class CatsViewModelFactory(private val catsRepository: CatsRepository) :
     ViewModelProvider.NewInstanceFactory() {
-    override fun <T : ViewModel?> create(modelClass: Class<T>): T =
+    @Suppress("UNCHECKED_CAST")
+    override fun <T : ViewModel> create(modelClass: Class<T>): T =
         CatsViewModel(catsRepository) as T
 }
\ No newline at end of file
diff --git a/flowcats/src/main/java/otus/homework/flowcats/DiContainer.kt b/flowcats/src/main/java/otus/homework/flowcats/DiContainer.kt
index 485152e2..479958b5 100644
--- a/flowcats/src/main/java/otus/homework/flowcats/DiContainer.kt
+++ b/flowcats/src/main/java/otus/homework/flowcats/DiContainer.kt
@@ -7,7 +7,7 @@ class DiContainer {
 
     private val retrofit by lazy {
         Retrofit.Builder()
-            .baseUrl("https://cat-fact.herokuapp.com/facts/")
+            .baseUrl("https://catfact.ninja/")
             .addConverterFactory(GsonConverterFactory.create())
             .build()
     }
diff --git a/flowcats/src/main/java/otus/homework/flowcats/Fact.kt b/flowcats/src/main/java/otus/homework/flowcats/Fact.kt
index 602303eb..81998454 100644
--- a/flowcats/src/main/java/otus/homework/flowcats/Fact.kt
+++ b/flowcats/src/main/java/otus/homework/flowcats/Fact.kt
@@ -3,22 +3,8 @@ package otus.homework.flowcats
 import com.google.gson.annotations.SerializedName
 
 data class Fact(
-	@field:SerializedName("createdAt")
-	val createdAt: String,
-	@field:SerializedName("deleted")
-	val deleted: Boolean,
-	@field:SerializedName("_id")
-	val id: String,
-	@field:SerializedName("text")
-	val text: String,
-	@field:SerializedName("source")
-	val source: String,
-	@field:SerializedName("used")
-	val used: Boolean,
-	@field:SerializedName("type")
-	val type: String,
-	@field:SerializedName("user")
-	val user: String,
-	@field:SerializedName("updatedAt")
-	val updatedAt: String
+	@field:SerializedName("fact")
+	val fact: String,
+	@field:SerializedName("length")
+	val length: Int
 )
\ No newline at end of file
diff --git a/flowcats/src/main/java/otus/homework/flowcats/MainActivity.kt b/flowcats/src/main/java/otus/homework/flowcats/MainActivity.kt
index edea434b..4d99bc55 100644
--- a/flowcats/src/main/java/otus/homework/flowcats/MainActivity.kt
+++ b/flowcats/src/main/java/otus/homework/flowcats/MainActivity.kt
@@ -1,8 +1,14 @@
 package otus.homework.flowcats
 
-import androidx.appcompat.app.AppCompatActivity
+import MyResult
 import android.os.Bundle
+import android.widget.Toast
 import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import kotlinx.coroutines.launch
 
 class MainActivity : AppCompatActivity() {
 
@@ -14,8 +20,25 @@ class MainActivity : AppCompatActivity() {
         val view = layoutInflater.inflate(R.layout.activity_main, null) as CatsView
         setContentView(view)
 
-        catsViewModel.catsLiveData.observe(this){
-            view.populate(it)
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                catsViewModel.catFact.collect { result ->
+                    when (result) {
+                        is MyResult.Success -> view.populate(result.data)
+                        is MyResult.Error -> {
+                            val errorMessage = when {
+                                result.errorResId != null -> this@MainActivity.getText(result.errorResId)
+                                result.errorMsg != null -> result.errorMsg
+                                else -> this@MainActivity.getText(R.string.app_unknown_error)
+                            }
+                            Toast.makeText(this@MainActivity, errorMessage, Toast.LENGTH_LONG)
+                                .show()
+                        }
+
+                    }
+
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/flowcats/src/main/java/otus/homework/flowcats/Result.kt b/flowcats/src/main/java/otus/homework/flowcats/Result.kt
new file mode 100644
index 00000000..aedfa920
--- /dev/null
+++ b/flowcats/src/main/java/otus/homework/flowcats/Result.kt
@@ -0,0 +1,11 @@
+import androidx.annotation.StringRes
+
+sealed class MyResult<out T> {
+
+    class Success<T>(val data: T) : MyResult<T>()
+
+    class Error(
+        @StringRes val errorResId: Int? = null,
+        val errorMsg: String? = null
+    ) : MyResult<Nothing>()
+}
\ No newline at end of file
diff --git a/flowcats/src/main/res/values/strings.xml b/flowcats/src/main/res/values/strings.xml
index ba737b82..63cbb21c 100644
--- a/flowcats/src/main/res/values/strings.xml
+++ b/flowcats/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">Flow cats</string>
+    <string name="app_unknown_error">Unknown error</string>
 </resources>
\ No newline at end of file
diff --git a/flowcats/src/main/res/xml/network_security_config.xml b/flowcats/src/main/res/xml/network_security_config.xml
new file mode 100644
index 00000000..2e8fae1b
--- /dev/null
+++ b/flowcats/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <debug-overrides>
+        <trust-anchors>
+            <!-- Для отладки через http proxy -->
+            <certificates src="user" />
+        </trust-anchors>
+    </debug-overrides>
+</network-security-config>
\ No newline at end of file
diff --git a/operators/src/androidTest/java/otus/homework/flow/ExampleInstrumentedTest.kt b/operators/src/androidTest/java/otus/homework/flow/ExampleInstrumentedTest.kt
deleted file mode 100644
index 2a37f840..00000000
--- a/operators/src/androidTest/java/otus/homework/flow/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package otus.homework.flow
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("otus.homework.flow", appContext.packageName)
-    }
-}
\ No newline at end of file
diff --git a/operators/src/main/AndroidManifest.xml b/operators/src/main/AndroidManifest.xml
index b8ab777d..51948c58 100644
--- a/operators/src/main/AndroidManifest.xml
+++ b/operators/src/main/AndroidManifest.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="otus.homework.flow">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/operators/src/main/java/otus/homework/flow/SampleInteractor.kt b/operators/src/main/java/otus/homework/flow/SampleInteractor.kt
index 1993c064..804efd1f 100644
--- a/operators/src/main/java/otus/homework/flow/SampleInteractor.kt
+++ b/operators/src/main/java/otus/homework/flow/SampleInteractor.kt
@@ -1,7 +1,15 @@
 package otus.homework.flow
 
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterNot
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onCompletion
+import kotlinx.coroutines.flow.take
+import kotlinx.coroutines.flow.transform
+import kotlinx.coroutines.flow.zip
 
 @ExperimentalCoroutinesApi
 class SampleInteractor(
@@ -18,7 +26,12 @@ class SampleInteractor(
      * 6) возвращает результат
      */
     fun task1(): Flow<String> {
-        return flowOf()
+        return sampleRepository.produceNumbers()
+            .map { it * 5 }
+            .filterNot { it <= 20 }
+            .filter { it % 2 == 1 }
+            .map { "$it won" }
+            .take(3)
     }
 
     /**
@@ -29,7 +42,14 @@ class SampleInteractor(
      * Если число не делится на 3,5,15 - эмитим само число
      */
     fun task2(): Flow<String> {
-        return flowOf()
+        return sampleRepository.produceNumbers().transform {
+            emit(it.toString())
+            when {
+                it % 15 == 0 -> emit("FizzBuzz")
+                it % 5 == 0 -> emit("Buzz")
+                it % 3 == 0 -> emit("Fizz")
+            }
+        }
     }
 
     /**
@@ -38,7 +58,10 @@ class SampleInteractor(
      * Если айтемы в одно из флоу кончились то результирующий флоу также должен закончится
      */
     fun task3(): Flow<Pair<String, String>> {
-        return flowOf()
+        return sampleRepository.produceColors()
+            .zip(sampleRepository.produceForms()) { color, form ->
+                color to form
+            }
     }
 
     /**
@@ -48,6 +71,16 @@ class SampleInteractor(
      * При любом исходе, будь то выброс исключения или успешная отработка функции вызовите метод dotsRepository.completed()
      */
     fun task4(): Flow<Int> {
-        return flowOf()
+        return sampleRepository.produceNumbers()
+            .catch {
+                if (it is IllegalArgumentException) {
+                    emit(-1)
+                } else {
+                    throw it
+                }
+            }
+            .onCompletion {
+                sampleRepository.completed()
+            }
     }
 }
\ No newline at end of file