add comments
merge changes