Added a comment
New Comments
merged some stuff