Update to window functions