* #2 pull request finished for the current code structure.