Update for next amp release