Checking in old changes -- no idea why (probably window size).