Finished almost all changes, trying to figure out the place of making
difference between Model and Diagram.