updated with time based filtering