Minor tweaks, going to debug data discrepancies
Filter function