updated with plot fix