modified to begin handle comments