Updated plotting, includes Sigma and JRs model