more changes for time feature