syncing chris' changes.