Rachel's home work

Change-Id: I783c090c059cfc1b463dd39da4e83d3dc4b1a17b