Sigh, syncing and some more changes..