updated window module and updated references