added stuff from svn