Updated to fix window scoping issue