syncing up multiple changes, need to do this but could be a mess.