Add changes from Jan.
Make database section and the chart more relevant.