Sync changes from nark(fsa)