Made Window more useful