Updated to match hmt-git.com