Update extraction of windows.