* Added next figure
* Some code refactored