Solving sync issues...