Do not merge!
This is a fallback branch+build, retaining the old plotting logic.
No changes between version 2 and version 2
