Merge changes from Lauren.
Update log.