Updates to evaluation of eta in window