Made the main use the new window thing.