address more review notes from Vivien