Woops, bring back critical line & use Set/GetSize to track window size #520