The One Laptop Per Child project has formed a partnership with Microsoft, despite a contentious history between the nonprofit group and the software giant, reports the Associated Press.

The laptop organization produces inexpensive “XO” computers for schoolchildren to spread access to technology in the developing world. Currently the group sells the computers for $188, but it would like to reduce the cost to just $100.

In the past, the two organizations have traded barbs, with Microsoft publicly criticizing the XO computer’s small screen and processing power.

Nicholas Negroponte, the nonprofit group’s founder, hopes the addition of Microsoft Windows software will increase sales of the laptops. He says he has received 600,000 laptop orders but had hoped to be selling millions at this point.