added some filtering and shit