Modified version of svn7