updated to match svn apl