added time based filtering