removed waterman windowing
work in progress