updated Window class to include some changes