with time changes
merged