diff --git a/Overall-architecture.md b/Overall-architecture.md
index d1c5785..3eb8ec4 100644
--- a/Overall-architecture.md
+++ b/Overall-architecture.md
@@ -771,19 +771,35 @@ Broker gets done message from worker and basically only mark submission as done
 
 Web API is notified about job status through simple http calls originated from broker. After that API is deciding if evaluated submission will be evaluated immediatelly or on demand. More detailed description follows:
 
-- todo
+- job ended with status "OK"
+    - if submission was evaluation of reference solution
+        - results of evaluation are loaded from fileserver and unzipped
+        - actual time and memmory consumption and other suitable results are retrieved
+        - solution evaluation database entity is created and persisted
+        - if evaluation of results failed report to administrator is sent
+    - if submission was normal student evaluation
+        - if user submitted solution by him/herself then nothing is done here
+        - administrator or supervisor submitted exercise as particular user
+            - results of submission are processed as described further in "On demand loading" chapter
+- job ended with status "FAILED"
+    - job failure is saved into database alongside other reported errors
+    - email is prepared and sent to ReCodEx administrator
+
+#### On demand loading
+
+Realised as calling of evaluate API endpoint. Results of submission are loaded from fileserver and then processed. More detailed description follows:
+
+- results of submission are retrived from fileserver
+- with job config used for submission results are loaded into internal API structures
+- typed results are used to compute overall score of solution
+- above detected score with any other suitable information are stored into database as solution evaluation entity
 
 ### Web Application
 
 Web Application has only a simple work to do. If results is obtained on demand then proper API call is executed and results are obtained and shown to user. More detailed description follows:
 
-- T
-- O
-- D
-- O
-- .
-- .
-- .
+- if results of submission are not prepared yet evaluate API endpoint is called
+- after this results should be present and can be shown to user
 
 
 ## Installation