try a new version and clean up
treemap added