done with repeat feature, time need to be update