Syncing up

More changes