added dynamic comments