device sync part is revised