Added more windows