sync svn. combined client, more samples.