yet more work for remote sync