revised for c5Sync