#2 code from SVN modules