Did a refactor of my code so that master and plugins get updated first