lots of changes --- save w/ sync now