Updated to new agreement