Updated to include a filter and improved reporting