partial update with Rachel's suggestions