tryin to fix all sync issues