few changes
merge