update to match svn repo r7