Updated all plot generation for the resubmission