Millionaire Tax Formula 2.0