diff --git a/city/__init__.py b/city/__init__.py
index a01670c..5f6bed9 100644
--- a/city/__init__.py
+++ b/city/__init__.py
@@ -1,2 +1,2 @@
 from .create_city import create_night_city
-from .create_city import create_simple_city
+from .create_city import create_day_city
diff --git a/city/create_city.py b/city/create_city.py
index 60bd094..7ec0b22 100644
--- a/city/create_city.py
+++ b/city/create_city.py
@@ -8,7 +8,7 @@
 from bh_trees import Inverter, Sequence, Selector
 
 
-def create_simple_city():
+def create_day_city():
 
     graph = {
         Sequence(): {
diff --git a/doc/city_night_v0.xml b/doc/city_night_v2.xml
similarity index 100%
rename from doc/city_night_v0.xml
rename to doc/city_night_v2.xml
diff --git a/doc/city_simple_v0.xml b/doc/city_simple_v2.xml
similarity index 100%
rename from doc/city_simple_v0.xml
rename to doc/city_simple_v2.xml
diff --git a/doc/city_v1.xml b/doc/city_v1.xml
deleted file mode 100644
index df3e3f7..0000000
--- a/doc/city_v1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<mxfile host="app.diagrams.net" modified="2021-08-28T14:45:11.318Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36" etag="5b4mSfmMTylu8mq9SVA5" version="15.0.3" type="device"><diagram id="nk9YK_D2KPzZqeeqOcZr" name="Page-1">7VvblpowFP0aH9tFCCA+WmR0OlNtvaypT7NQotKisTGO2q9vkEQE1KHLW9B5kpycQLJ3sjk5xAK0xssqcaajb9hFfkFV3GUBVgqqCqCusJ/AsuIWU9NDy5B4LrdFhpb3F3Ejbzicey6axRwpxj71pnFjH08mqE9jNocQvIi7DbAff+rUGaKUodV3/LT1xXPpKLSaYlyBvYa84Ug8GSi8ZuwIZ26YjRwXL7ZM0C5Ai2BMw6vx0kJ+gJ7AJWz3sKd20zGCJjRLgy4qrfyvrWljUS0Tv/RnuXp9+hQ0WHeOrsSIkcsA4EVM6AgP8cTx7cj6heD5xEXBbRVWinyeMZ4yI2DGX4jSFWfTmVPMTCM69nktWnr0Z9D8s85L3a2aypLfeV1Y8UJ6uByBGZ6TPjowRjFtHDJE9IAfDP2C8W89gINZRXiMKFkxB4J8h3pv8Qni8Hk23PhFVLALzsb/MAM/mBF+mlTM8Pu+Of6cP6lstQuq4bMhfOkRdjUMrlr2s221G80UjXGSFiOPotbUWQO1YCoaJ2Tg+b6FfUzWbeFgMFD7fWafUYJ/o60a1+gZunGIjjdEKFoeBJDXFoVmCdUWoraIJBAIn9GW/BnKuTAv3f5qUDOuBl2q1bB5vUnPDCOErLYaBcXudl3UbF26HKOGXIym9M2q2dbTLoX70bHrln1ahTP7aLfC9Uxd0w8Skl3hQEk2hVO1vKyjvfC/O8/NU89z3vQ79lhXNuTqepxcCBOkhQuXt0rwtunGEVTqt08lAHfCpXEHXKr3wSXMv8S+G3KcfBObkcpSgspw0p2PylSM0rRbdrlp1W4qTNESYYqqXT1MMW9/DWlZdVOyjFFu9siX34llplSuVJOWkjmraZfbTMqUTv3xtpJOJV02rdPT6Jfrr+tk3wnRdXVkutoudE21B40ToQuAbOgaKXRr5RYz2PVGp8pe48pDx37OIdJqUTakiymkHwOgWcTU6DSDuEgRwZNdySHgySBJB9cG3NwNeJ1hzH7ajbRuR1wk4H8H8Dg7V4EfaomtgHlt+NXiRyC0N8DJmhQoShUIiW5vLal6ox2sqUblyI3dGRTo+ktApHR2bpCVvWojv9gb0qmNSGLJrzZHqAbMqBpAro+TEOSFmyu8CTJzKtfnSZDO/b00mk9286Yyf6Yinc6pH2tp75zMnF+SK6yC93DILDM3J/88fZzO7Uj+lZs7c365VTkAFF0ymQPprN968y7eMWwXb1dymSdJnuq7fp4EpHOAm/y2wDt3MJtF6WDekwAM5SS/Exoo8s3odOpvM6NDuPOHcvKs3PVRhvk/lPP+QQ49Y9iiShW1wNzkXi9AzcnPyB1HzY7vmY/t7qUCyot8RNbMuFZtsnNn0CpWjP69FR5siv4EB+1/</diagram></mxfile>
\ No newline at end of file
diff --git a/doc/worker_day_v2.xml b/doc/worker_day_v2.xml
new file mode 100644
index 0000000..3b36627
--- /dev/null
+++ b/doc/worker_day_v2.xml
@@ -0,0 +1 @@
+<mxfile host="app.diagrams.net" modified="2021-09-05T08:58:08.600Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36" etag="WLHtm65OUmekdA_6WHtM" version="15.0.6" type="device"><diagram id="W3p-pNmYOCLfn28GMmYI" name="Page-1">7Vtbc6IwFP41PrrDHXy0iF2nVFov2/XJQYnALhqHxqr76zdIEGmkS2dwAx36YMlJIuH7ziXnEFuivj7ch/bWe4QOCFoC5xxaYq8l4D+Ow/8iyTGWtEVZjiVu6DuxjE8FY/8PIEIy0d35DnjNDEQQBsjfZoVLuNmAJcrI7DCE++ywFQyyd93aLqAE46Ud0NIX30FeLNVkLpV/B77rJXfmkyde28lgInj1bAfuL0Si0RL1EEIUX60POggi9BJc4nn9nN7zwkKwQUUm7OaHo9lVg463mOsqUPqzh+e2mCwOHZMnBg4GgDRhiDzowo0dGKn0LoS7jQOir+VwKx1jQrjFQh4LfwGEjoRNe4cgFnloHZBecPDRz2j6N5m0Zhc9vQP55lPjmDQ2KDxeTIqas8u+dNqplcyLny96qFzciOgV7sIl+AAsgeifHboAfTSuc6YXGwaAa4AXhCeGILCR/5ZdiE0U1D2PSznEF4TGz1DKN5SWTqnIlFGhYbR8I2VKKVnlmx3syJ1erNGDMWoJSoBXfbcI8ZUbXY2N56kx1A1KBbIE7z0fgfHWPmGzx8E4S+bKDwIdBjA8zRVX2hIsl1j+ikL4G1z0LDRZklNK3kCIwOFjUmgMk/CvkehCgj8vqESwT0Mpn8RH7yKMKtyNcOc7jSkVNiWxoClJTC2p2cGUz6jMlNFmA1M+owrTDQwV7fqDYe9arDMNfWKNyo11q5VwPdY5ykKRlRvFOoljHusaz1jcjqSCdqSytCO+8YzlM8o0Weeb1K58RjWWjEo5sY67mw7MqzGvtvld+33Mk0XmMU9p7KmwPckF7YlnWirhtYbS8illmrPLeT5SH0xmX8pFUmkBexep5IE/MsbWdFQyzI4MNEe6BrMmLESlpOxL5ioHs0rBPBjP9e7o3pr3p6ZZQ5Db51eZCcqKxBplLU+Zh0YX6/MEX00GZh1VWqkc1p0rGn322Rhwo2f0agg0tYtljzRPF8zq7jzOBzoqhHJuqpY6j1i5a4e2KFcObVGmcGy28XlgCaQs9O9zCWwPJjTZ9i04Zfs+VaC8IqlccTXOw9TqJQhCYzyfMJ6i7zlj9WVmPGrD6Q04ZesQm/rjLThle8SETrC6+mRgDb/UmQRNehf02J9JEOic62lgmt37OpZoKHwrsKmgS+uP1g8jKoNZ+OPJGg9iNa8d2J3qVdIFuiKmdzG2HPYlNUSYru+y9xfi16uEKWL1ajO0V05yvpoWwFT1P4KMm+nPuE59F7+GE42/</diagram></mxfile>
\ No newline at end of file
diff --git a/doc/worker_night_v0.xml b/doc/worker_night_v0.xml
deleted file mode 100644
index d0159ee..0000000
--- a/doc/worker_night_v0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<mxfile host="app.diagrams.net" modified="2021-08-31T18:17:32.341Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36" etag="4rneWXP0HZNgSAadia2s" version="15.0.3" type="device"><diagram id="W3p-pNmYOCLfn28GMmYI" name="Page-1">7Vpdc6IwFP01ProDQgAflaLr1IpVu90+dVAisIvGifFrf/0GCV/GOu5IEWbrg5CTBJJzLvfeBGqSvth3sbVyn5AN/VpDsPc16aHWoD9BoIcAOYSIKoMQcLBnh5CYAGPvD2Qg6+dsPBuuMw0JQj7xVllwhpZLOCMZzMIY7bLN5sjP3nVlOZADxjPL59FXzyZuiGpASPDv0HPc6M5iNOGFFTVmwNq1bLRLQZJRk3SMEAnPFnsd+gF5ES9hv84HtfHAMFySazrUn/RnUsfoebrYtl04FIRBp65KbHDkEM0Y2pQAVkSYuMhBS8s3ErSN0WZpw+CyAi0lbfoIrSgoUvAXJOTA1LQ2BFHIJQuf1cK9R34G3b8BVnpL1Tzs2ZWPhQMr8NNlDKzRBs/ghTlGZmNhB5IL7eSwXTD/1A0YmV2IFpDgA22AoW8Rb5s1EIvZmRO3S6SgJ0yNf1FGrooyVBB8SHUKim/puqTbsVScolq5FAVVUfTzlQHlkoZdd2v5G3anV3P0aIxqDcWn02hPMT1zgrOx0Tf0iTnipMwKtXM9Ascr60jWjobGrChzz/d15CN87CvN5/PGbEbxNcHoN0zV2MpUAcolSbYQE7i/yCGrlSQWiVgolqPyLglsYhSt3FRQU4RPol3iaNdbAwq09Emu/NoAarZ8jl+tMZWUnPiti80swWrj3gSrSlVcTvFBRL7SVUml8lQy98gMzBsfljxMH2QtXxHubfmVibXFG752peE3S2X4X57sZkFVNW9FWdch8uiYY28gn3iDZuPkKQ9Hynqd2EU8jBui3pep3Goqoliqh1/jol67pT9SZGLSP703eTuXqT+/GAPdyDWTnGszeD5Tn2ogsPtcwmkcFksTTpucAL3xu94adc33zku/nyvHxWTroniSrN99NSTyq9An84cRWfnQHPcmPXNQQa7l0nEN+Dx62Ov3W9183UUx9AK1bPQqldlWLj4EA3BtupZ7An4+XYu3KZj5xC83CkrXlMqk9gWIDnLP0W/zk+CjmFTh9EpVyuYvI9U5misXizT5xJkod+e2+R+4l2vXdaBcLzkj0b+0SfnakmgD+EV3nCILFX4NppRuca3y3r/TG9CDMDBaI2M8ifc4KhcOTncy7h9qVX4rgyObHsyXUc65TTGEK1px8ZcWk8+XwtVA8hGYZPwF</diagram></mxfile>
\ No newline at end of file
diff --git a/doc/worker_night_v2.xml b/doc/worker_night_v2.xml
new file mode 100644
index 0000000..5e1626a
--- /dev/null
+++ b/doc/worker_night_v2.xml
@@ -0,0 +1 @@
+<mxfile host="app.diagrams.net" modified="2021-09-05T10:09:56.939Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36" etag="6zm5hZTCv8wJbJiI07XD" version="15.0.6" type="device"><diagram id="W3p-pNmYOCLfn28GMmYI" name="Page-1">7Vpdc6IwFP01PnYHgqH4aCm6Tqm0arfrk4MQgd1onBgr7q9vkPC1VO2OdosdXjT35F4TzknuTdSGos/DLrWX/j1xEW4AyQ0bym0DAFmBEn+LkG2MXCkQxohHA1d4ZcAw+IMEKAK9deCiVcGREYJZsCyCDlkskMMKmE0p2RTdZgQXR13aHioBQ8fGZfQ5cJkfo1ryXBH+HQWen4wsS6JnbifOAlj5tks2OUgxGopOCWFxax7qCEfsJbzEcZ09venEKFqw9wSsJ+HWbF/jlj+d6NdI7YzvHq+UZHJsmzwxcjkBwiSU+cQjCxsbGXpDyXrhouhjJW5lPiYhSw7KHPyFGNsKNe01Ixzy2RyLXhQG7GcU/g0Ka5zruQ3FJ++MbWIsGN3mgiJznO/LwnZWElemSTC3ImvqoAPcALHcbOohdsivFTtGxOVGECp0EZkjPiHuQBG2WfBSXFm2WKBe6pdpyBtCxn+RVK4lPVVSpVqKglrRkzdptSQV036x8VqM9GwN7oxBA6iYP8bNlPKWF7WGxuOT0deN0hIoCrzxA4aGS3tH1oYX46KYswBjnWBCd7HKTHOQ43B8xSj5jXI9Uw024UFJXhBlKDzIoegFmqguovjLKbDJSqmc1Ec/V0ZV6aN4r+vdsaR3dCvBau2kutydrKhaKUWVUm7s9Pq3b2VG09BH1uC8mXE2A29nRledqlD9oMzYlD47M8pqvY+OZLyj+0iu1iFD1mpJT5a0WSlJ4Z7cKOm90fhLHR7l1l8pEsqfnSLVfeQPjKH1NDgzzS5Emtt8i2YNTBX1TJVIUWHVaJbLB4DecKK3B11r0nkyzQtkOSUwYVkFn85yc99q7httvqBHaVK5OLZT0qrDNriuS/Febt57TQHVqsWgPl6dQdOKfZtQrj1tfdSz+l/q+gmrd/0E5XL00DPNdvcSD1XpGao6hypQvjncWz84udLI4i8P1rAXL/OLI1uF1SO7VSJbb3NuJZ5LLpHh/5gtuJn9JL7ry/2zQDFeAQ==</diagram></mxfile>
\ No newline at end of file
diff --git a/doc/worker_simple_v0.xml b/doc/worker_simple_v0.xml
deleted file mode 100644
index 9786a53..0000000
--- a/doc/worker_simple_v0.xml
+++ /dev/null
@@ -1 +0,0 @@
-<mxfile host="app.diagrams.net" modified="2021-09-03T17:34:17.837Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36" etag="lBLG6hGTMT9nAKn6jgdt" version="15.0.6" type="device"><diagram id="W3p-pNmYOCLfn28GMmYI" name="Page-1">7Vtde6I6EP41XroP3+ClInbdtWqFnp5e9UGJwi4aN8aq++tP1CBikLqnCmTbXlQySSB532EmMwkV2Zyu75A79++hB8KKJHjritysSORPEMjPVrLZSwxB2wsmKPD2IjEW2MFvQIW032QZeGCRaIghDHEwTwpHcDYDI5yQuQjBVbLZGIbJp87dCWAE9sgNWelT4GGfzkIVYvlXEEz86MliNOGpGzWmgoXvenB1JJKtimwiCPH+aro2QbgFL8Jl3691pvYwMARm+JIO1XvzAVcRfBhOXxs+6AtCt1XVZTo4vIlmDDwCAC1ChH04gTM3tGJpA8HlzAPb2wqkFLfpQDgnQpEIfwCMN5RNd4khEfl4GtJasA7wv9vuX1Raej6qaa7pnXeFDS2w06UILOASjUDGHCO1cdEE4Ix2yr7ddv5HD6Bg3gE4BRhtSAMEQhcHr0kFcameTQ7tYirIBWXjT5hReGGGEII2R522xefjurjbrpQfo0a5GFV5YfT2zKjloobe99UNl/RJT73Bd2tQkbSQTKMxRORqsr2yrY5lOr0BQ2WSqJUfYGDP3R1YK+Iak6SMgzA0YQjRrq88Ho+l0YjIFxjBn+CoxtOGmqplUfIKEAbrTAxprRw5LeqKFZ2WV7FjEyNv5R85NU24EewyA7tZ7xJB3XSuiq+nAsNT0vA1pKGsXQnfqpbEV5eLxlfXeLE4+fsQ5UJLJZfKUCnMG9PtvfNduYHma0LRms+Nq81f8Y0LFb9WKsXXPwl9L6GiWCpGDcaUNermdyJxeuSf2Xae01ZfD49W17Suu/oyRiB99TU0VEXNJOdyGymVzkbWGALa9otZH9z1XlqPnQ6HKzBRLnAFZo+mX0fPaDW3lYdvc/3l12+IqlEaq/x26//bHzEl6EsFozCPkk6NyAs1BSRYLqW0ZGE8G8fzHK8bZYsnVTb86Lc7nfrddR1yPs5CU8oGr8ZNMj5/i6SqF65y9at7Gdq1DwMy6IP66LWk+hy2hKJb7EdKe51oxmEY71AWbnI7OZCu6qXyQ9G4j+zkfe8fYiQFjgMYo8jFdSbrLMy7ELLfs9tOu9fl0DfVxBPjohWOde0DmJtLMylqubaKtQ8QZF7OjVoqblQ2zXVYMgscBye6XLZ0ls56g1a7S36ErlUfWLZzyCpy5w6Uk0iwZhQONps8ZMAmP73HwZXXOvkArqsF+t/G03LWdOYiBK+z6k/xx7jTWlc/SGh4YrXf9BVZSam3Q0U9J8+QyugHOd91K0ZTMZVyIjRrkInkI7fRnqoUaAHT8/Wfe/pnsamx70c6hoWdZpGGv+xg4Ti+0h84miSHNnY+N/X/iNFUCAuLRLNG/Xfsvxy+XSiPCWQPTDYe250mv5GNKBQY2aS+UNKnTXrD1rxpk7Rr26T0HRjpJEiLv725/hZM6jy5icluT3lhSbfU0XCTqy7vO1zYwY6sUf9V+2ly6Vzf2V1L3rfTFO2cpygMa43BmsmfOu0Oj7nTU70uAdhsZqZtH9bMBHGraTU5RFpUikT6fALunAk5Pc1drEVhcE5h4/zhMTk/402K8Vfi+7Vr/K29bP0H</diagram></mxfile>
\ No newline at end of file
diff --git a/doc/worker_v1.xml b/doc/worker_v1.xml
deleted file mode 100644
index 538959f..0000000
--- a/doc/worker_v1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<mxfile host="app.diagrams.net" modified="2021-08-28T14:48:16.487Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.159 Safari/537.36" etag="gVtOsyDvsAaUd9xLpcFs" version="15.0.3" type="device"><diagram id="W3p-pNmYOCLfn28GMmYI" name="Page-1">7Vxbd6o4FP41PnYWtwA+Wood1lhp1c6ZPnWhRGEGjQtj1fn1J0giID3KdCwktX0oZCcB831h39jaUq359j72lsED8mHUUiR/21LvWgr5kyRySCS7VGJoIBXM4tBPRXImGIb/Qiqk82br0IerwkCMUITDZVE4QYsFnOCCzItjtCkOm6KoeNelN4MlwXDiRWXpj9DHQSo1gZTJf4fhLGB3ltmC5x4bTAWrwPPRJidS7ZZqxQjh9Gy+tWCUgMdwSed1f9F7+GAxXOAqE24erCd8E6On8fztNoCPktTv3hgq/XB4x1YMfQIAbaIYB2iGFl5kZ9LbGK0XPkwuK5FWNqaH0JIIZSL8G2K8o2x6a4yIKMDziPbCbYj/Sqb/BmjrJddzt6VX3jd2tFFeLkVghdbxBJ5YI9s2XjyD+MQ4LR2XrD93AwrmPURziOMdGRDDyMPhW3GDeHSfzQ7jMirICWXjvzCjicIMISTe5SYlzZd8XzZt36qPUZMvRoEojH4+M4Avauh137xoTe/0wx38YQ9aih6RZdyOY3I2S86Gds+2Ru6gRGWRqE0QYjhcenuwNsQ0FkmZhlFkoQjF+7nqdDpVJhMiX+EY/QNzPb4+1oF+ipI3GGO4PYkh7VWZ0aKmWDNoe5MZNplZqyBn1HTpk2BXS7BbnT4RdKzRRfH1ATR97T18TWWs6hfC9+bgtDBfR20aYEMXReXUb0S0iqpK5UpTaaVHpu/+z4flM7a+LjW99YUxtvXvfLPizm9ztfOFUWWfTwx72DhhxhCFGX4fNVnmilGzZGUe3D9tIhm55J/ljF7IYWg/Pdt9y76sK2xO4Puu8NgEGjjJxsdd4ebNVbuEuDN8tTqDe/e1+9zriegOc+cNq6YoiurjCoeBflbjKHxZd7UtCjcNpLuqcqrylcJknzun1LpOnxx0b55oqMV4lRxSc/KFEy3Naz65nODKGfRj6B/doTNy3L6ARsfgzuiwJBv/iu3jCorZkvMKiq9kiiF/c5Nxw1lQqYjCTf0OQXVOFa44VcpRTt/uDA4hZdkHEDbClNWiITpUDDQX/ZS9sSTEJMC/piQIZ+yPMW43j7FyJX6WYnAHffllYhpsSMnutoejg5YRDuzjTErzYOvfKd+zQfh54wy4Ms76FWTHqnOj88WNMNmxOrgxuOJGLb+S735Nnxbo3Pm04FdGf+T0LgtxPaZeU3gz9UwTfnmX9nh3cwC9UYL+9tnp3YnryRoSbxiDd7T3cdhADu7z4MIqux7A20eAN58P16/gGwcAVHRlAGdu5hXUWFXnhi83E5RdHYFfkcqyzp1i+v7CzVk9dfah0fmqY9OFqQKugxuFK25AObB4dHq9zn0SWwgcJcsS4C1MBuVAIl/PKXDQJh+/iOAA7CvI1YGqdc2Ar4o0Rvo3NzmPkhNuwOmi8ywIF9s4HPm9zVeeM5etUBdA2k7/yyRBAG9ZJ+aKvef7CAevXGcdBmlmP5mx78v98Ihq/wQ=</diagram></mxfile>
\ No newline at end of file
diff --git a/lucia.py b/lucia.py
index a00a35d..e028d68 100644
--- a/lucia.py
+++ b/lucia.py
@@ -1,7 +1,7 @@
 from bh_trees import BlackBoard
-from city import create_simple_city
+from city import create_day_city
 from city import create_night_city
-from worker import create_simple_worker
+from worker import create_day_worker
 from worker import create_night_worker
 
 
@@ -77,8 +77,8 @@ def _choose_strategy(self):
 
         # Choose day behavior
         if self._turn%40<=30:
-            self._city_tree = create_simple_city()
-            self._worker_tree = create_simple_worker()
+            self._city_tree = create_day_city()
+            self._worker_tree = create_day_worker()
 
         # Choose night behavior
         if self._turn%40>30:
diff --git a/worker/__init__.py b/worker/__init__.py
index f43a832..ea7cb83 100644
--- a/worker/__init__.py
+++ b/worker/__init__.py
@@ -1,2 +1,2 @@
 from .create_worker import create_night_worker
-from .create_worker import create_simple_worker
+from .create_worker import create_day_worker
diff --git a/worker/create_worker.py b/worker/create_worker.py
index eac1b77..cc06d01 100644
--- a/worker/create_worker.py
+++ b/worker/create_worker.py
@@ -12,36 +12,30 @@
 from bh_trees import Inverter, Sequence, Selector
 
 
-def create_simple_worker():
+def create_day_worker():
 
     graph = {
-        Selector(): {
-            Inverter(): {
-                CanAct(): {}
-                },
-            Sequence(): {
-                IsCargoFull(): {},
-                Selector(): {
-                    Selector(): {
-                        BuildCityTile(): {},
-                        Sequence(): {
-                            IsCityNeeded():{},
-                            FindNearestEmpty():{},
-                            MoveToPosition():{}
-                            }
-                        },
-                    Sequence(): {
-                        FindNearestCity(): {},
-                        MoveToPosition(): {}
-                        }
-                    }
+        Sequence(): {
+            CanAct(): {},
+            Selector(): {
+                Sequence(): {
+                    IsCargoFull(): {},
+                    IsCityNeeded(): {},
+                    FindNearestEmpty(): {}
+                    },
+                Sequence(): {
+                    IsCargoFull(): {},
+                    FindNearestCity(): {}
+                    },
+                FindNearestResource(): {}
                 },
             Selector(): {
-                Pillage(): {},
                 Sequence(): {
-                    FindNearestResource(): {},
-                    MoveToPosition(): {}
-                    }
+                    IsCargoFull(): {},
+                    BuildCityTile(): {}
+                    },
+                Pillage(): {},
+                MoveToPosition(): {}
                 }
             }
         }
@@ -52,21 +46,18 @@ def create_simple_worker():
 def create_night_worker():
 
     graph = {
-        Selector(): {
-            Inverter(): {
-                CanAct(): {}
+        Sequence(): {
+            CanAct(): {},
+            Selector(): {
+                Sequence(): {
+                    IsCargoFull(): {},
+                    FindNearestCity(): {},
+                    },
+                FindNearestResource(): {}
                 },
-            Sequence(): {
-                IsCargoFull(): {},
-                FindNearestCity(): {},
-                MoveToPosition(): {}
-               },
             Selector(): {
                 Pillage(): {},
-                Sequence(): {
-                    FindNearestResource(): {},
-                    MoveToPosition(): {}
-                    }
+                MoveToPosition(): {}
                 }
             }
         }
diff --git a/worker/tasks/find_nearest_empty.py b/worker/tasks/find_nearest_empty.py.save
similarity index 60%
rename from worker/tasks/find_nearest_empty.py
rename to worker/tasks/find_nearest_empty.py.save
index 5a20f28..3d8e3cf 100644
--- a/worker/tasks/find_nearest_empty.py
+++ b/worker/tasks/find_nearest_empty.py.save
@@ -26,32 +26,36 @@ def run(self):
         width = self._blackboard.get_value('width')
         height = self._blackboard.get_value('height')
 
-#        close_city = self.find_closest_city(player, object)
+        close_city = self.find_closest_city(player, object)
 
-        random.shuffle(self.DIRECTIONS)
-        for dir in self.DIRECTIONS:
-            pos = object.pos.translate(dir,1)
-            if pos.x>=0 and pos.y>=0 and pos.x<width and pos.y<height:
-                cell = game_map.get_cell_by_pos(pos)
-                if cell.resource is None and cell.citytile is None:
-                    if pos:
-                        self._blackboard.set_values(position = pos)
-                        return True
+        if close_city:
+            pos
 
         return False
 
 
-#    def find_closest_city(self, player, object):
+    def find_closest_city(self, player, object):
+
+        closest_city_tile = None
+        if len(player.cities) > 0:
+            closest_dist = math.inf
 
-#        closest_city_tile = None
-#        if len(player.cities) > 0:
-#            closest_dist = math.inf
+            for k, city in player.cities.items():
+                for city_tile in city.citytiles:
+                    dist = city_tile.pos.distance_to(object.pos)
+                    if dist < closest_dist:
+                        closest_dist = dist
+                        closest_city_tile = city_tile
 
-#            for k, city in player.cities.items():
-#                for city_tile in city.citytiles:
-#                    dist = city_tile.pos.distance_to(object.pos)
-#                    if dist < closest_dist:
-#                        closest_dist = dist
-#                        closest_city_tile = city_tile
+        return coses_city_tile if dist<4 else None
 
-#        return closest_city_tile
+    def find_closest_empty(self):
+
+        random.shuffle(self.DIRECTIONS)
+        for dir in self.DIRECTIONS:
+            pos = object.pos.translate(dir,1)
+            if pos.x>=0 and pos.y>=0 and pos.x<width and pos.y<height:
+                cell = game_map.get_cell_by_pos(pos)
+                if cell.resource is None and cell.citytile is None:
+                    if pos:
+                        return pos
diff --git a/worker/tasks/pillage.py b/worker/tasks/pillage.py
index ad26c2e..5321246 100644
--- a/worker/tasks/pillage.py
+++ b/worker/tasks/pillage.py
@@ -9,9 +9,9 @@ def _init_(self):
 
     def run(self):
         map = self._blackboard.get_value('map')
-        object = self._blackboard.get_value('object')        
+        object = self._blackboard.get_value('object')
 
-        if self.is_in_resource(object, map):
+        if self.is_in_resource(object, map) and object.get_cargo_space_left()>0:
             pillage = object.pillage()
             self._blackboard.append_values(actions=pillage)
             return True
@@ -20,4 +20,4 @@ def run(self):
 
 
     def is_in_resource(self, object, map):
-        return map.get_cell_by_pos(object.pos).resource is not None
\ No newline at end of file
+        return map.get_cell_by_pos(object.pos).resource is not None