One the second thought I think we should always return window and instead ignore it in the higher layer calling this.