Modified plugin based on working through Origin failures