made comments more dynamic