Part two - Fixing the HMR Flaws