Updated with timestamping filter