Updated Window Class