adding ability to handle comments