change arhitecture, add wrong working filter