Updated Rolling handicaps model