first stab at redoing table 2