improve time finding