Better handling of result plot