fixed up windows containment