Update Amy's changes for Session 2

Update Amy's changes for Session 2