Took away some initial filtering