Update for clean baseline