lsFit and calcWindow Update