Some comments
Fixed merge conflict