Adding a bit of Windows 10 back into the mix sounds good to me.