file splitting & bug fix on data sync