Microsoft’s new-look Surface Pro fixes our electronics writer’s longest-standing frustration with its keyboard.

The Windows maker just dropped details on its new 12-inch Surface Pro and thinner 13-inch Surface Laptop that seem to fit the bill, at least on paper. With prices starting at under $1,000 (not including the Surface Pro’s Flex Keyboard),

The new Surface Laptop and Surface Pro will come with 16GB of RAM, 256GB or 512GB of UFS storage, and three finishes: Ocean, Violet, and Platinum. They're set for release on Tuesday, May 20 starting at $899.99 and $799.99, respectively. Preorders are now available from the Microsoft Store and Best Buy.