updated comments (testing merging)

merging