update with simon's suggestions