HM: Updated build