Updated Millar model (still WIP).