no more assuming window

#4 as a by product of #5