Replace with updated master and slave