Fixed recursion issue, but still syncing bugs