diff --git a/intercepting-filter/etc/Intercepting-filter.png b/intercepting-filter/etc/Intercepting-filter.png
deleted file mode 100644
index 5a97db09c..000000000
Binary files a/intercepting-filter/etc/Intercepting-filter.png and /dev/null differ
diff --git a/intercepting-filter/etc/intercepting-filter.jpg b/intercepting-filter/etc/intercepting-filter.jpg
index e472553c3..6e5811379 100644
Binary files a/intercepting-filter/etc/intercepting-filter.jpg and b/intercepting-filter/etc/intercepting-filter.jpg differ
diff --git a/intercepting-filter/etc/intercepting-filter.ucls b/intercepting-filter/etc/intercepting-filter.ucls
index 9141c79dc..35475e0b8 100644
--- a/intercepting-filter/etc/intercepting-filter.ucls
+++ b/intercepting-filter/etc/intercepting-filter.ucls
@@ -1,161 +1,191 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <class-diagram version="1.1.8" icons="true" automaticImage="JPEG" always-add-relationships="false" 
   generalizations="true" realizations="true" associations="true" dependencies="false" nesting-relationships="true">  
-  <class id="1" language="java" name="com.iluwatar.Client" project="intercepting-filter" 
-    file="/intercepting-filter/src/main/java/com/iluwatar/Client.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="232" width="236" x="168" y="253"/>    
+  <class id="1" language="java" name="com.iluwatar.Order" project="intercepting-filter" 
+    file="/intercepting-filter/src/main/java/com/iluwatar/Order.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="1152" y="624"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="true" package="true" protected="true" private="true" static="true"/>      
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </class>  
-  <class id="2" language="java" name="com.iluwatar.OrderFilter" project="intercepting-filter" 
-    file="/intercepting-filter/src/main/java/com/iluwatar/OrderFilter.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="106" width="160" x="360" y="689"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="3" language="java" name="com.iluwatar.FilterManager" project="intercepting-filter" 
-    file="/intercepting-filter/src/main/java/com/iluwatar/FilterManager.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="124" width="178" x="168" y="525"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="4" language="java" name="com.iluwatar.AddressFilter" project="intercepting-filter" 
-    file="/intercepting-filter/src/main/java/com/iluwatar/AddressFilter.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="106" width="160" x="560" y="689"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="5" language="java" name="com.iluwatar.FilterChain" project="intercepting-filter" 
-    file="/intercepting-filter/src/main/java/com/iluwatar/FilterChain.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="124" width="152" x="168" y="689"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <interface id="6" language="java" name="com.iluwatar.Filter" project="intercepting-filter" 
+  <interface id="2" language="java" name="com.iluwatar.Filter" project="intercepting-filter" 
     file="/intercepting-filter/src/main/java/com/iluwatar/Filter.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="88" width="160" x="661" y="853"/>    
+    <position height="-1" width="-1" x="850" y="551"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="true" package="true" protected="true" private="true" static="true"/>      
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </interface>  
-  <class id="7" language="java" name="com.iluwatar.Target.DListener" project="intercepting-filter" 
+  <class id="3" language="java" name="com.iluwatar.Target.DListener" project="intercepting-filter" 
     file="/intercepting-filter/src/main/java/com/iluwatar/Target.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="106" width="223" x="168" y="1089"/>    
+    <position height="-1" width="-1" x="214" y="1017"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="true" package="true" protected="true" private="true" static="true"/>      
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </class>  
-  <class id="8" language="java" name="com.iluwatar.NameFilter" project="intercepting-filter" 
-    file="/intercepting-filter/src/main/java/com/iluwatar/NameFilter.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="106" width="160" x="760" y="689"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <class id="9" language="java" name="com.iluwatar.ContactFilter" project="intercepting-filter" 
+  <class id="4" language="java" name="com.iluwatar.ContactFilter" project="intercepting-filter" 
     file="/intercepting-filter/src/main/java/com/iluwatar/ContactFilter.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="106" width="160" x="960" y="689"/>    
+    <position height="106" width="150" x="584" y="922"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="true" package="true" protected="true" private="true" static="true"/>      
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </class>  
-  <class id="10" language="java" name="com.iluwatar.DepositFilter" project="intercepting-filter" 
+  <class id="5" language="java" name="com.iluwatar.DepositFilter" project="intercepting-filter" 
     file="/intercepting-filter/src/main/java/com/iluwatar/DepositFilter.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="106" width="160" x="1160" y="689"/>    
+    <position height="106" width="150" x="774" y="922"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="true" package="true" protected="true" private="true" static="true"/>      
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </class>  
-  <class id="11" language="java" name="com.iluwatar.Target" project="intercepting-filter" 
+  <class id="6" language="java" name="com.iluwatar.Client" project="intercepting-filter" 
+    file="/intercepting-filter/src/main/java/com/iluwatar/Client.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="440" y="338"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
+      <operations public="true" package="true" protected="true" private="true" static="true"/>    
+    </display>  
+  </class>  
+  <class id="7" language="java" name="com.iluwatar.OrderFilter" project="intercepting-filter" 
+    file="/intercepting-filter/src/main/java/com/iluwatar/OrderFilter.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="106" width="150" x="964" y="922"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
+      <operations public="true" package="true" protected="true" private="true" static="true"/>    
+    </display>  
+  </class>  
+  <class id="8" language="java" name="com.iluwatar.FilterManager" project="intercepting-filter" 
+    file="/intercepting-filter/src/main/java/com/iluwatar/FilterManager.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="442" y="603"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
+      <operations public="true" package="true" protected="true" private="true" static="true"/>    
+    </display>  
+  </class>  
+  <class id="9" language="java" name="com.iluwatar.AbstractFilter" project="intercepting-filter" 
+    file="/intercepting-filter/src/main/java/com/iluwatar/AbstractFilter.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="177" width="150" x="774" y="705"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
+      <operations public="true" package="true" protected="true" private="true" static="true"/>    
+    </display>  
+  </class>  
+  <class id="10" language="java" name="com.iluwatar.AddressFilter" project="intercepting-filter" 
+    file="/intercepting-filter/src/main/java/com/iluwatar/AddressFilter.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="106" width="150" x="1154" y="922"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
+      <operations public="true" package="true" protected="true" private="true" static="true"/>    
+    </display>  
+  </class>  
+  <class id="11" language="java" name="com.iluwatar.FilterChain" project="intercepting-filter" 
+    file="/intercepting-filter/src/main/java/com/iluwatar/FilterChain.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="124" width="150" x="363" y="705"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
+      <operations public="true" package="true" protected="true" private="true" static="true"/>    
+    </display>  
+  </class>  
+  <class id="12" language="java" name="com.iluwatar.NameFilter" project="intercepting-filter" 
+    file="/intercepting-filter/src/main/java/com/iluwatar/NameFilter.java" binary="false" corner="BOTTOM_RIGHT">    
+    <position height="106" width="150" x="1344" y="922"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
+      <operations public="true" package="true" protected="true" private="true" static="true"/>    
+    </display>  
+  </class>  
+  <class id="13" language="java" name="com.iluwatar.Target" project="intercepting-filter" 
     file="/intercepting-filter/src/main/java/com/iluwatar/Target.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="196" width="161" x="168" y="853"/>    
+    <position height="-1" width="-1" x="215" y="767"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="true" package="true" protected="true" private="true" static="true"/>      
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </class>  
-  <realization id="12">    
+  <realization id="14">    
     <end type="SOURCE" refId="9"/>    
-    <end type="TARGET" refId="6"/>  
+    <end type="TARGET" refId="2"/>  
   </realization>  
-  <association id="13">    
-    <end type="SOURCE" refId="1" navigable="false">      
-      <attribute id="14" name="filterManager"/>      
-      <multiplicity id="15" minimum="0" maximum="1"/>    
+  <generalization id="15">    
+    <end type="SOURCE" refId="4"/>    
+    <end type="TARGET" refId="9"/>  
+  </generalization>  
+  <generalization id="16">    
+    <end type="SOURCE" refId="12"/>    
+    <end type="TARGET" refId="9"/>  
+  </generalization>  
+  <generalization id="17">    
+    <end type="SOURCE" refId="10"/>    
+    <end type="TARGET" refId="9"/>  
+  </generalization>  
+  <association id="18">    
+    <end type="SOURCE" refId="11" navigable="false">      
+      <attribute id="19" name="target"/>      
+      <multiplicity id="20" minimum="0" maximum="1"/>    
     </end>    
-    <end type="TARGET" refId="3" navigable="true"/>    
+    <end type="TARGET" refId="13" navigable="true"/>    
     <display labels="true" multiplicity="true"/>  
   </association>  
-  <association id="16">    
-    <end type="SOURCE" refId="5" navigable="false">      
-      <attribute id="17" name="target"/>      
-      <multiplicity id="18" minimum="0" maximum="1"/>    
+  <generalization id="21">    
+    <end type="SOURCE" refId="5"/>    
+    <end type="TARGET" refId="9"/>  
+  </generalization>  
+  <generalization id="22">    
+    <end type="SOURCE" refId="7"/>    
+    <end type="TARGET" refId="9"/>  
+  </generalization>  
+  <association id="23">    
+    <end type="SOURCE" refId="8" navigable="false">      
+      <attribute id="24" name="filterChain"/>      
+      <multiplicity id="25" minimum="0" maximum="1"/>    
     </end>    
     <end type="TARGET" refId="11" navigable="true"/>    
     <display labels="true" multiplicity="true"/>  
   </association>  
-  <association id="19">    
-    <end type="SOURCE" refId="3" navigable="false">      
-      <attribute id="20" name="filterChain"/>      
-      <multiplicity id="21" minimum="0" maximum="1"/>    
-    </end>    
-    <end type="TARGET" refId="5" navigable="true"/>    
-    <display labels="true" multiplicity="true"/>  
-  </association>  
-  <realization id="22">    
-    <end type="SOURCE" refId="4"/>    
-    <end type="TARGET" refId="6"/>  
-  </realization>  
-  <realization id="23">    
-    <end type="SOURCE" refId="2"/>    
-    <end type="TARGET" refId="6"/>  
-  </realization>  
-  <nesting id="24">    
-    <end type="SOURCE" refId="11"/>    
-    <end type="TARGET" refId="7"/>  
+  <nesting id="26">    
+    <end type="SOURCE" refId="13"/>    
+    <end type="TARGET" refId="3"/>  
   </nesting>  
-  <association id="25">    
-    <end type="SOURCE" refId="5" navigable="false">      
-      <attribute id="26" name="filters"/>      
-      <multiplicity id="27" minimum="0" maximum="2147483647"/>    
+  <association id="27">    
+    <end type="SOURCE" refId="6" navigable="false">      
+      <attribute id="28" name="filterManager"/>      
+      <multiplicity id="29" minimum="0" maximum="1"/>    
     </end>    
-    <end type="TARGET" refId="6" navigable="true"/>    
+    <end type="TARGET" refId="8" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="30">    
+    <end type="SOURCE" refId="9" navigable="false">      
+      <attribute id="31" name="next"/>      
+      <multiplicity id="32" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="2" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="33">    
+    <end type="SOURCE" refId="11" navigable="false">      
+      <attribute id="34" name="chain"/>      
+      <multiplicity id="35" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="2" navigable="true"/>    
     <display labels="true" multiplicity="true"/>  
   </association>  
-  <realization id="28">    
-    <end type="SOURCE" refId="10"/>    
-    <end type="TARGET" refId="6"/>  
-  </realization>  
-  <realization id="29">    
-    <end type="SOURCE" refId="8"/>    
-    <end type="TARGET" refId="6"/>  
-  </realization>  
   <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
     sort-features="false" accessors="true" visibility="true">    
     <attributes public="true" package="true" protected="true" private="true" static="true"/>