Revise sync-mechanism