updating with latest from svn
trying again