More tinkering with WINDFOR