Work in progress to get complete sync