time functionality improved