Table and charts properly edited and added