Imported current non-working version from svn repo