modified regex, added time filter