Update

Adjustments suggested for Eirin.