The new window fixes
Removed