Windows improvement