Update for new Flexible Windows