Added more info to windows