Syncing Ryan's Changes

Syncing the changes that Ryan sent in his email.