Changed up HMC and momentum