added the ability to add comments with not elegant but temporary solution