RLIB-11 changes for graphing from ahuszko