merged all time range stuff to public gem