adding length window support
filter testcase
resolving conflicts and merging