merged changes in time-config
merged again