Revised for uploading to the CSW SVN.