wip/flam3-svn
