removed debug labels. renamed time fields (need to implement a better solution)