Final update to make charts work