new version for more sections
merge from server