Changed order of graphs, added NON-NLS