New version with some filtering options added