Update to include HMC work