Changed the observer diagram.
Minor refactoring on the observer code.