Changed control structure for time state