changed some code about the timefields