New graphics and table changes