time unit fixing, not yet completed