First draft of main filter added