remove window, change to var