updated draft with Lisa's changes