adding changes from svn spike