Incorporating Sara's Updates