export of the "scrawl2" branch