Syncing Dan's changes