Modified Window implementation