Added first version of comments