Changes to time function for estats