Syncing

Catching up to new changes made by Pat