latest version (cleaned up a few 'usage' comments)