add option to enable comments