Hey looking good, happy to merge.  Can you put back the window check for performance reasons. Thanks!