More comments implementation