Overhauling the windows mechanism