removed some filtering