Tested on second machine
Updated plotting