Add checks for inSync