refactored a bit for the wiki
...