consolidated code, modified filters
consolidated code, modified filters