Pretting up the tables to address #27