split update process to force data sync
add TODOs