added time filtering yeeehaw
the ole merge