syncWithRemote class modified