adds comments handling