addressed review concerns from etienne (round 1).