demo adjustments for recent changes