Added filter method
Rearranged group
Rearranged behavior