Make updates based on Ed's comments