added possibility to add comments