final changes of today
merged