replaced deprecated time units