Added toggle comments