reupdated time + fixed 2 deprecation warnings