modified for TableBuilder.java