Apple is preparing to introduce two new Mac all-in-one models in the second half of next year, and is testing a new server-grade iMac for the high-end market, according to Taipei-based Digitimes Research.

The server-grade model would compete with Microsoft’s recently released Surface Studio, Digitimes says.

Digitimes’ figures show that current all-in-one worldwide shipments total about 12-13 million units a year, a relatively small segment of the 250 million unit PC market.

The two new iMacs for 2017 are expected to be manufactured by Quanta, which also makes all-in-ones for HP.

Apple currently markets 21.5-inch and 27-inch iMacs. The two new models are expected to hit the market in the third quarter of 2017, looking to catch the year-end holiday season.

The new server-grade iMac, due around the end of this year, is expected to feature Intel’s Xeon E3-1285 v6 processor and the latest discrete graphics card.