diff --git a/flowcats/src/main/java/otus/homework/flowcats/CatsRepository.kt b/flowcats/src/main/java/otus/homework/flowcats/CatsRepository.kt
index 10fcb77d..82622c34 100644
--- a/flowcats/src/main/java/otus/homework/flowcats/CatsRepository.kt
+++ b/flowcats/src/main/java/otus/homework/flowcats/CatsRepository.kt
@@ -1,6 +1,7 @@
 package otus.homework.flowcats
 
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 
 class CatsRepository(
@@ -8,10 +9,14 @@ class CatsRepository(
     private val refreshIntervalMs: Long = 5000
 ) {
 
-    fun listenForCatFacts() = flow {
+    fun listenForCatFacts(): Flow<Result<Fact>> = flow {
         while (true) {
-            val latestNews = catsService.getCatFact()
-            emit(latestNews)
+            try {
+                val latestNews = catsService.getCatFact()
+                emit(Result.Success(latestNews))
+            } catch (e: Exception) {
+                emit(Result.Error(e))
+            }
             delay(refreshIntervalMs)
         }
     }
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..3a6a91ca 100644
--- a/flowcats/src/main/java/otus/homework/flowcats/CatsViewModel.kt
+++ b/flowcats/src/main/java/otus/homework/flowcats/CatsViewModel.kt
@@ -2,30 +2,32 @@ package otus.homework.flowcats
 
 import androidx.lifecycle.*
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 
 class CatsViewModel(
     private val catsRepository: CatsRepository
 ) : ViewModel() {
 
-    private val _catsLiveData = MutableLiveData<Fact>()
-    val catsLiveData: LiveData<Fact> = _catsLiveData
+    private val _cats = MutableStateFlow<Result<Fact>>(Result.Success(Fact()))
+    val cats: StateFlow<Result<Fact>> = _cats.asStateFlow()
 
     init {
-        viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                catsRepository.listenForCatFacts().collect {
-                    _catsLiveData.value = it
-                }
-            }
-        }
+        catsRepository.listenForCatFacts()
+            .flowOn(Dispatchers.IO)
+            .onEach {
+                _cats.value = it
+            }.launchIn(viewModelScope)
     }
 }
 
 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..481960c5 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 = 0
 )
\ 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..ed1aa70c 100644
--- a/flowcats/src/main/java/otus/homework/flowcats/MainActivity.kt
+++ b/flowcats/src/main/java/otus/homework/flowcats/MainActivity.kt
@@ -2,7 +2,12 @@ package otus.homework.flowcats
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.widget.Toast
 import androidx.activity.viewModels
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import java.net.SocketTimeoutException
 
 class MainActivity : AppCompatActivity() {
 
@@ -14,8 +19,17 @@ class MainActivity : AppCompatActivity() {
         val view = layoutInflater.inflate(R.layout.activity_main, null) as CatsView
         setContentView(view)
 
-        catsViewModel.catsLiveData.observe(this){
-            view.populate(it)
-        }
+        catsViewModel.cats.onEach {
+            when (it) {
+                is Result.Error -> {
+                    val message = when(it.error) {
+                        is SocketTimeoutException -> R.string.socket_timeout
+                        else -> {R.string.unknown}
+                    }
+                    Toast.makeText(this, message, Toast.LENGTH_LONG).show()
+                }
+                is Result.Success -> view.populate(it.data)
+            }
+        }.launchIn(lifecycleScope)
     }
 }
\ 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..9f1ea181
--- /dev/null
+++ b/flowcats/src/main/java/otus/homework/flowcats/Result.kt
@@ -0,0 +1,6 @@
+package otus.homework.flowcats
+
+sealed interface Result<out D> {
+    data class Success<out D>(val data: D) : Result<D>
+    data class Error<D>(val error: Throwable) : Result<D>
+}
\ 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..aa9b73bf 100644
--- a/flowcats/src/main/res/values/strings.xml
+++ b/flowcats/src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
 <resources>
     <string name="app_name">Flow cats</string>
+    <string name="socket_timeout">Не удалось получить ответ от сервера</string>
+    <string name="unknown">Неизвестная ошибка</string>
 </resources>
\ No newline at end of file
diff --git a/operators/src/main/java/otus/homework/flow/SampleInteractor.kt b/operators/src/main/java/otus/homework/flow/SampleInteractor.kt
index 1993c064..b8a4b560 100644
--- a/operators/src/main/java/otus/homework/flow/SampleInteractor.kt
+++ b/operators/src/main/java/otus/homework/flow/SampleInteractor.kt
@@ -18,7 +18,8 @@ class SampleInteractor(
      * 6) возвращает результат
      */
     fun task1(): Flow<String> {
-        return flowOf()
+        return sampleRepository.produceNumbers().map { it * 5 }
+            .filterNot { it <= 20 || it % 2 == 0 }.map { "$it won" }.take(3)
     }
 
     /**
@@ -29,7 +30,14 @@ class SampleInteractor(
      * Если число не делится на 3,5,15 - эмитим само число
      */
     fun task2(): Flow<String> {
-        return flowOf()
+        return sampleRepository.produceNumbers().flatMapConcat { num ->
+            when {
+                num % 15 == 0 -> flowOf("$num", "FizzBuzz")
+                num % 3 == 0 -> flowOf("$num", "Fizz")
+                num % 5 == 0 -> flowOf("$num", "Buzz")
+                else -> flowOf("$num")
+            }
+        }
     }
 
     /**
@@ -38,7 +46,9 @@ class SampleInteractor(
      * Если айтемы в одно из флоу кончились то результирующий флоу также должен закончится
      */
     fun task3(): Flow<Pair<String, String>> {
-        return flowOf()
+        return sampleRepository.produceColors().zip(sampleRepository.produceForms()) { color, form ->
+            color to form
+        }
     }
 
     /**
@@ -48,6 +58,11 @@ class SampleInteractor(
      * При любом исходе, будь то выброс исключения или успешная отработка функции вызовите метод dotsRepository.completed()
      */
     fun task4(): Flow<Int> {
-        return flowOf()
+        return sampleRepository.produceNumbers()
+            .catch { cause: Throwable ->
+                if (cause is IllegalArgumentException) emit(-1)
+                else throw cause
+            }
+            .onCompletion { sampleRepository.completed() }
     }
 }
\ No newline at end of file