more changes to support sync