Updated based on latest version of HL.