Syncing up some changes