Better time matching